xend: Allow for non-existent xen-python-path binary.
authorKeir Fraser <keir@xensource.com>
Thu, 8 Nov 2007 15:32:14 +0000 (15:32 +0000)
committerKeir Fraser <keir@xensource.com>
Thu, 8 Nov 2007 15:32:14 +0000 (15:32 +0000)
On Solaris, xen-python-path is unnecessary.

Signed-off-by: John Levon <john.levon@sun.com>
tools/misc/xend

index 1bddf0a776d6507633b15f1774ca061deb323dd5..dcb600d6a2a9222e9e276723e0819bb7ddbd5cfc 100644 (file)
@@ -33,13 +33,14 @@ import signal
 import time
 import commands
 
-result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]),
-                                               'xen-python-path'))
-if result[0] != 0:
-    print >>sys.stderr, result[1]
-    sys.exit(1)
+xpp = os.path.join(os.path.dirname(sys.argv[0], 'xen-python-path'))
+if os.path.exists(xpp):
+    result = commands.getstatusoutput(xpp)
+    if result[0] != 0:
+        print >>sys.stderr, result[1]
+        sys.exit(1)
 
-sys.path.append(result[1])
+    sys.path.append(result[1])
 
 from xen.xend.server import SrvDaemon